53cdd1bd9362fb4b2f66d5e13cf5358ddd313c3a,src/main/java/org/everit/jira/core/impl/SupportComponent.java,SupportComponent,getDates,#DateTime#DateTime#boolean#boolean#TimeTrackerGlobalSettings#,63

Before Change


      if (!TimetrackerUtil.containsSetTheSameDay(includeDatesAsSet,
          DateTimeConverterUtil.convertDateTimeToDate(fromDate))
          && ((fromDate.getDayOfWeek() == DateTimeConstants.SUNDAY)
              || (fromDate.getDayOfWeek() == DateTimeConstants.SATURDAY))) {
        fromDate = fromDate.withDayOfYear(fromDate.getDayOfYear() + 1);
        continue;
      }

After Change


      // check weekend - pass
      if (!TimetrackerUtil.containsSetTheSameDay(includeDatesAsSet,
          fromDate.getUserTimeZoneDate())
          && ((fromDate.getUserTimeZone().getDayOfWeek() == DateTimeConstants.SUNDAY)
              || (fromDate.getUserTimeZone().getDayOfWeek() == DateTimeConstants.SATURDAY))) {
        fromDate = new DateTimeServer(fromDate.getUserTimeZone().plusDays(1));
        // fromDate = fromDate.withDayOfYear(fromDate.getDayOfYear() + 1);